From: Liu, Jinsong <jinsong.liu@intel.com>
Date: Fri, 20 May 2011 12:42:23 +0000 (+0100)
Subject: x86/mca: Fix debug output.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10335
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e982084c7604a4386b84655664ea029aba25770a;p=xen.git

x86/mca: Fix debug output.

At x86_mcinfo_dump(), a little bug at printk information,
illusively= indicate an CMCI/POLLED error to a MCE error, this will
make debug confusing.

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
---

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index 909085b0c9..9f86616f42 100644
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -940,10 +940,11 @@ void x86_mcinfo_dump(struct mc_info *mi)
         printk(XENLOG_WARNING
                "CPU%d: Machine Check Exception: %16"PRIx64"\n",
                mc_global->mc_coreid, mc_global->mc_gstatus);
-    } else {
-        printk(XENLOG_WARNING "MCE: The hardware reports a non "
-               "fatal, correctable incident occurred on "
-               "CPU %d.\n",
+    } else if (mc_global->mc_flags & MC_FLAG_CMCI) {
+        printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", 
+               mc_global->mc_coreid);
+    } else if (mc_global->mc_flags & MC_FLAG_POLLED) {
+        printk(XENLOG_WARNING "POLLED occurred on CPU %d.\n",
                mc_global->mc_coreid);
     }